Use MIN instead of MAX to avoid reading more than fits into the buffer.
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 31 Aug 2005 08:43:31 +0000 (08:43 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 31 Aug 2005 08:43:31 +0000 (08:43 +0000)
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
tools/console/daemon/io.c

index e7c023bf304ce54b115705fcd79339fb688f5072..885e2914564c92f501229cf36767d73534cfafec 100644 (file)
@@ -371,7 +371,7 @@ static void handle_tty_read(struct domain *dom)
                (struct ring_head *)(dom->page + PAGE_SIZE/2);
        int i;
 
-       len = read(dom->tty_fd, msg, MAX(XENCONS_SPACE(inring), sizeof(msg)));
+       len = read(dom->tty_fd, msg, MIN(XENCONS_SPACE(inring), sizeof(msg)));
        if (len < 1) {
                close(dom->tty_fd);
                dom->tty_fd = -1;